From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 5 Mar 2009 16:34:59 +0000 (+0000)
Subject: * nsterm.m (ns_select): Shortcircuit if reentrant call.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1396
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f0f4f568dffdc882783960910208066de8cf9506;p=emacs.git

* nsterm.m (ns_select): Shortcircuit if reentrant call.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b3076d9e793..cbafa9245d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-05  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsterm.m (ns_select): Shortcircuit if reentrant call.
+
 2009-03-05  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_select_entity): New function.
diff --git a/src/nsterm.m b/src/nsterm.m
index 3e9fb0b2a3a..d34641f6be0 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3221,7 +3221,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
   NSEvent *ev;
 /*  NSTRACE (ns_select); */
 
-  if (NSApp == nil /* || ([NSApp isActive] == NO &&
+  if (NSApp == nil || inNsSelect == 1 /* || ([NSApp isActive] == NO &&
                       [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil
  inMode:NSDefaultRunLoopMode dequeue:NO] == nil) */)
     return select (nfds, readfds, writefds, exceptfds, timeout);